Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Nov 2011 08:26:58 +0000 (00:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 11 Nov 2011 08:26:58 +0000 (00:26 -0800)
commita604ea9ec377ea21418615a70d5ba5d055cd3c1b
treec3add12d7717cf80968d71c78776925298587bab
parentc4d6964ee96a1a87520ca9895ad70f4361fa3009
parent94ee2cb10115a1c8397487b67feb341e13a8e73c
Merge from trunk.